Removing baroiq and cambridge formats. (#1066)

* Remove Cambridge and Baroiq formats as per Feb 28 RFC.

diff --git a/gpsbabel.qrc b/gpsbabel.qrc
index 3638219042af28d27deca1151c4483bf9f5dd752..fa17fff4f8d463e316871ab9c8bb8c5c9be5c164 100644 (file)
--- a/gpsbabel.qrc
+++ b/gpsbabel.qrc
@@ -1,7 +1,6 @@
 <RCC>
     <qresource prefix="/">
         <file>style/arc.style</file>
-        <file>style/cambridge.style</file>
         <file>style/csv.style</file>
         <file>style/custom.style</file>
         <file>style/garmin301.style</file>

diff --git a/reference/format0.txt b/reference/format0.txt
index f03faaf78c36bb072d4878e615fd8e67aeeeb799..13feb64e47d9b9573a9f967f8089641493219977 100644 (file)
--- a/reference/format0.txt
+++ b/reference/format0.txt
@@ -1,5 +1,3 @@
-baroiq         Brauniger IQ Series Barograph Download
-cambridge      dat     Cambridge/Winpilot glider software
 v900           Columbus/Visiontac V900 files (.csv)
 csv            Comma separated values
 iblue747       csv     Data Logger iBlue747 csv

diff --git a/reference/format1.txt b/reference/format1.txt
index 424a81f7f90451ca0eb11e3888a0753b554a0ff5..56235675df30a685ec3ff08c49a1cc0707e5d095 100644 (file)
--- a/reference/format1.txt
+++ b/reference/format1.txt
@@ -1,7 +1,5 @@
 internal       xcsv            ? Character Separated Values
 internal       tabsep          All database fields on one tab-separated line
-serial baroiq          Brauniger IQ Series Barograph Download
-file   cambridge       dat     Cambridge/Winpilot glider software
 file   v900            Columbus/Visiontac V900 files (.csv)
 file   csv             Comma separated values
 internal       custom          Custom "Everything" Style

diff --git a/reference/format2.txt b/reference/format2.txt
index 8ddca1773400379c4ba91ce312c3bef66330969c..9da8f0f5977b3ba224d3412110f0e08cecc4fbce 100644 (file)
--- a/reference/format2.txt
+++ b/reference/format2.txt
@@ -1,7 +1,5 @@
 internal       rw----  xcsv            ? Character Separated Values
 internal       rw----  tabsep          All database fields on one tab-separated line
-serial --r---  baroiq          Brauniger IQ Series Barograph Download
-file   rw----  cambridge       dat     Cambridge/Winpilot glider software
 file   r-r---  v900            Columbus/Visiontac V900 files (.csv)
 file   rw----  csv             Comma separated values
 internal       rw----  custom          Custom "Everything" Style

diff --git a/reference/format3.txt b/reference/format3.txt
index fe814dd920022566483b09c7f97d7ff45e91c395..a462ade387d6f31ce769d331c7d80230c10e904e 100644 (file)
--- a/reference/format3.txt
+++ b/reference/format3.txt
@@ -32,24 +32,6 @@ option       tabsep  prefer_shortnames       Use shortname instead of description    boolean
 
 option tabsep  datum   GPS datum (def. WGS 84) string                          https://www.gpsbabel.org/WEB_DOC_DIR/fmt_tabsep.html#fmt_tabsep_o_datum
 
-serial --r---  baroiq          Brauniger IQ Series Barograph Download  baroiq
-       https://www.gpsbabel.org/WEB_DOC_DIR/fmt_baroiq.html
-file   rw----  cambridge       dat     Cambridge/Winpilot glider software      xcsv
-       https://www.gpsbabel.org/WEB_DOC_DIR/fmt_cambridge.html
-option cambridge       snlen   Max synthesized shortname length        integer         1               https://www.gpsbabel.org/WEB_DOC_DIR/fmt_cambridge.html#fmt_cambridge_o_snlen
-
-option cambridge       snwhite Allow whitespace synth. shortnames      boolean                         https://www.gpsbabel.org/WEB_DOC_DIR/fmt_cambridge.html#fmt_cambridge_o_snwhite
-
-option cambridge       snupper UPPERCASE synth. shortnames     boolean                         https://www.gpsbabel.org/WEB_DOC_DIR/fmt_cambridge.html#fmt_cambridge_o_snupper
-
-option cambridge       snunique        Make synth. shortnames unique   boolean                         https://www.gpsbabel.org/WEB_DOC_DIR/fmt_cambridge.html#fmt_cambridge_o_snunique
-
-option cambridge       urlbase Basename prepended to URL on output     string                          https://www.gpsbabel.org/WEB_DOC_DIR/fmt_cambridge.html#fmt_cambridge_o_urlbase
-
-option cambridge       prefer_shortnames       Use shortname instead of description    boolean                         https://www.gpsbabel.org/WEB_DOC_DIR/fmt_cambridge.html#fmt_cambridge_o_prefer_shortnames
-
-option cambridge       datum   GPS datum (def. WGS 84) string                          https://www.gpsbabel.org/WEB_DOC_DIR/fmt_cambridge.html#fmt_cambridge_o_datum
-
 file   r-r---  v900            Columbus/Visiontac V900 files (.csv)    v900
        https://www.gpsbabel.org/WEB_DOC_DIR/fmt_v900.html
 file   rw----  csv             Comma separated values  xcsv

diff --git a/reference/help.txt b/reference/help.txt
index e118164f5586f5ae2552ac86a639c49448751f69..7960015473de287df0511ca60f92f2446b054e32 100644 (file)
--- a/reference/help.txt
+++ b/reference/help.txt
@@ -32,15 +32,6 @@ Options:
     -V               Print GPSBabel version and exit
 
 File Types (-i and -o options):
-       baroiq                Brauniger IQ Series Barograph Download
-       cambridge             Cambridge/Winpilot glider software
-         snlen                 Max synthesized shortname length
-         snwhite               (0/1) Allow whitespace synth. shortnames
-         snupper               (0/1) UPPERCASE synth. shortnames
-         snunique              (0/1) Make synth. shortnames unique
-         urlbase               Basename prepended to URL on output
-         prefer_shortnames     (0/1) Use shortname instead of description
-         datum                 GPS datum (def. WGS 84)
        v900                  Columbus/Visiontac V900 files (.csv)
        csv                   Comma separated values
          snlen                 Max synthesized shortname length

diff --git a/style/cambridge.style b/style/cambridge.style
deleted file mode 100644 (file)
index f0e2bce..0000000
--- a/style/cambridge.style
+++ /dev/null
@@ -1,18 +0,0 @@
-DESCRIPTION     Cambridge/Winpilot glider software
-SHORTLEN        8
-EXTENSION dat
-#
-#
-# FILE LAYOUT DEFINITIIONS:
-#
-FIELD_DELIMITER         COMMA
-RECORD_DELIMITER        NEWLINE
-BADCHARS                COMMA
-
-IFIELD INDEX,"1","%d"
-IFIELD LAT_HUMAN_READABLE,"","%d:%06.3f%c"
-IFIELD LON_HUMAN_READABLE,"","%03d:%06.3f%c"
-IFIELD ALT_METERS,"","%3.0fM"
-IFIELD CONSTANT,"","T"
-IFIELD SHORTNAME,"","%s"
-IFIELD DESCRIPTION,"","%s"

diff --git a/vecs.cc b/vecs.cc
index e91aa923abff0b78775b054a9643461762d32bb7..4f87e9883ea58b7c48ee39a1825ff00be32e22ca 100644 (file)
--- a/vecs.cc
+++ b/vecs.cc
@@ -308,13 +308,6 @@ struct Vecs::Impl {
       nullptr,
       nullptr,
     },
-    {
-      &brauniger_iq_fmt,
-      "baroiq",
-      "Brauniger IQ Series Barograph Download",
-      nullptr,
-      nullptr,
-    },
     {
       &mtk_fmt,
       "mtk",

diff --git a/xmldoc/formats/baroiq.xml b/xmldoc/formats/baroiq.xml
deleted file mode 100644 (file)
index d1d8274..0000000
--- a/xmldoc/formats/baroiq.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<para>Serial download protocol for the <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://www.brauniger.com">Brauniger</link> IQ series of
-barograph recording flight instruments.  This format creates a
-track of altitude vs time which can be merged with a GPS track
-of the same flight to create a three dimensional IGC file. </para>

diff --git a/xmldoc/formats/cambridge.xml b/xmldoc/formats/cambridge.xml
deleted file mode 100644 (file)
index 8334f87..0000000
--- a/xmldoc/formats/cambridge.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-      <para>Support for
-<link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://www.cambridge-aero.com/products.htm">Cambridge</link>
-and <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://www.winpilot.com"> Winpilot</link>
-       flight analysis and planning software for glider pilots.  </para>